237c6b74bd3000fa9e60d44c9e482114515f7dfe,platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchDiffRequestFactory.java,PatchDiffRequestFactory,createConflict,#Project#VirtualFile#String#Getter#String#UserDataHolder#ProgressIndicator#,63
Before Change
return createBadDiffRequest(project, file, texts);
}
else {
String path = FileUtil.toSystemDependentName(file.getPresentableUrl());
FileType type = file.getFileType();
String windowTitle = VcsBundle.message("patch.apply.conflict.title", path);
After Change
}, indicator.getModalityState());
ApplyPatchForBaseRevisionTexts texts = textsRef.get();
if (texts.getLocal() == null) throw new DiffRequestProducerException("Can't show diff for '" + file.getPresentableUrl() + "'");
if (texts.getBase() == null) {
String localContent = texts.getLocal().toString();